[coastguard skipped] Merge sparse cherrypicks from sparse-12115784-L14300030005311483 into 24Q2-release. COASTGUARD_SKIP: I7b0436565e2eb30eebd7f03375938ab6eba16951 COASTGUARD_SKIP: Iecee99e2d1bdf74de5609d18b138dd2ed9093871 Change-Id: I8d37dfefc5d500c3683c0baa53461f26f8fdaf25